new branch

new branch init commit
add new branch

add new branch
Merge pull request #2 from videostorm/mix_branch_20140623

Mix branch 20140623, fixes