Master added. There are yet some things to be implemented.
Merge pull request #8 from stbnps/master

Master added. There are yet some things to be implemented.