Some changes
Merge pull request #5 from cabowles/master

Some changes