Merging jira01-mlr-my-feature

Squashed commit of the following:

commit b006a197f3657392b6722957a855e15e02ef9667
Author: mruckman <nospam2008@mruckman.com>
Date:   Sun Oct 13 13:31:49 2013 -0700

    Applying changes

commit a7a58fa1c133fd56e2f1f8c3a377e4534ad40fdf
Author: mruckman <nospam2008@mruckman.com>
Date:   Sun Oct 13 13:30:51 2013 -0700

    Adding a new file