milestone 2
Merge pull request #2 from mindBeef/master

milestone 2