Merge pull request #16 from mredar/master

Merged update from ucldc.
Merge remote-tracking branch 'upstream/master'