Merge pull request #156 from zeitgeist87/master