Completed 2 tasks
Merge pull request #4 from Andyhasit/andy's-changes

Completed 2 tasks