Zack Commit 3
Merge pull request #3 from Danubian/master

Zack Commit 3