Merge pull request #1 from mindBeef/master

Milestone 2