id774 Merge pull request #63 from id774/master