Merge pull request #4 from ipri2013/master

Last.
Merge pull request #65 from juree/master

summerpull