Merge pull request #6 from pronamic/master

Develop upto date
Merge pull request #7 from pronamic/develop

Merge pull request #6 from pronamic/master