Moved stuff around. Merged master.
Merge pull request #170 from jpmontez/pub-neturon-fix

Moved stuff around. Merged master.