Merge pull request #11 from p1oooop/master

pull brandon-development to master... even though the comments are more or less missing.
More comments!
Merge pull request #13 from p1oooop/brandon-development

Brandon development