Merge pull request #95 from giastfader/master

Ready for 0.8.3
Merge pull request #16 from baasbox/master

update from origin master