lots of random stuff
Merge pull request #7 from ACRSupply/dev

lots of random stuff