Merge pull request #10 from hexaguin/develop

Merging for 0.5