Recent changes

Ghost Userrequested to merge
recent_changes into master

is good stuff

should fix issues 5 and 7

#6 (closed) #7 (closed)

Merge request reports