Merge pull request #21 from mdtrooper/master

There are some changes...