Merge pull request #8 from Pyriana/master

Getting everything up to date.
Merge remote-tracking branch 'upstream/master'