nightwing Merge pull request #28 from hyandell/master