Merge pull request #5 from Ben-Angel/master

tmp accept preview etc.
fixed format
Merge pull request #2 from oat-sa/master

accept  	fixed format