3rd commit.

Signed-off-by: Daniel Granlund <dgranlund@bloomberg.net>
Merge pull request #1 from dgranlund/Development

3rd commit.