Issue #9 - Finished

Please merge these files and close the issue #9