Develop

These changes have already been merged into pblasucci/master and submitted as a pull request. I just want to keep things "in sync" and "up to date".