Changed argument order in erlog.erl so state is always last
Merge branch 'develop'
Merge
update for @rvirding's new api