Add source code related issue #7