fixed bin files and template
added some stuff to users.md
rebased with upstream master
Merge pull request #3 from nknol/Feature/SecondPass

[WIP] Feature/SecondPass