tzlion Merge pull request #61 from tzlion/dev