Merge pull request #171 from kylemanna/misc