Merge pull request #25 from swytman/master

123