Merge pull request suavecode#163 from suavecode/develop

Big Merge for 0.9

Merge pull request suavecode#163 from suavecode/develop

Big Merge for 0.9

Merge pull request suavecode#137 from suavecode/develop

The big merge for 0.3

Merge branch 'develop'