More code and such
Merge pull request #3 from elsyd/master

More code and such