chrisalexander Merge pull request #22 from mahemoff/master