Merge pull request #5 from rgcoders/master

Bringing (rwd-strikes-back) branch up to date with master.