Fix gh #1, remove merge leftover from source