Closes #5

Code integrated