Merge pull request #107 from fireweb/master

some additional task
added some code base