Merge pull request #6 from mtrubs/master

reorganize and fix an issue