Merge pull request #12 from ka2m/master

Big updates