Merge pull request #14 from AndrewMagliozzi/master

the latest and greatest