Fixed compilation problem.

See issue #28.
Merged conflict.
Refixed compiler issue.

See issue #28.