Some further updates
Merge pull request #3 from Harbinger73/master

Some further updates