Merge pull request #24 from nsue/dev

Dev