Merge pull request #19 from iassic/master

master ahead of develop