Merge pull request #19 from UberIRC/develop

Version v0.1.1