more bugfixes
Merge branch 'master' of https://github.com/Mbarrowclift/diCe
Reverted back from c99 standard
Merge branch 'master' of https://github.com/Mbarrowclift/diCe
Merge branch 'master' into marc