Initial commit
Update for Bounty #22
Merge remote-tracking branch 'g/master'