Merge pull request #12 from llh1/master

Merge from development branch