new branch
Merge pull request #1 from jlightyear/split-sources

new branch - merged