Putting it all together
Merge pull request #6 from TumainiN/together

Putting it all together