Re-factored for continuous integration support.
Re-factored for continuous integration support.