Merge pull request #16 from bonekill/master

update to master
branch 2 commit
Merge pull request #17 from bonekill/branch2

Branch2