alemangui Merge pull request #11 from creaktive/acidmachine