Merge pull request #18 from mk13/master

Final format
UPDATES!@#$@$%@#$^%%#W$#@
resync