Issue #5 is fixed
Todo:
Final code-review and then merge the code into master