merge
Merge branch 'master' of github.com:rdadolf/phat
updating api
fixed mkfile problems