update
Merge pull request #1 from revoltlive/master

update
Merge pull request #3 from vikinghug/master

Merging Master into empty development branch