Merge pull request #57 from InebriatedSquirrel/master

Merge franciscomap