Merge pull request #14 from f4nt/master

Added some misc stuff
Merge remote branch 'upstream/master'