Merge pull request #6 from pronamic/master

Develop upto date