Code Refactoring (on dev branch)

I noticed that you added a page to the project wiki about submitting pull requests to the `dev` branch, so I combined my two former pull requests (#3 and #4) into this pull request.