add machine output + bugfixes
Merge pull request #14 from rottenbytes/machine_output

add machine output + bugfixes