Merge pull request #14 from apelade/projects

Projects
Merged with upstream
merging in latest changes
Merge remote-tracking branch 'upstream/projects' into projects