Fixed: Attemp to fix #7 (WIP).

Work in progress, to be tested by Travis.