Closes #4 and closes #5

Signed-off-by: Nils Van Geele <nils.vgeele@gmail.com>