Version 2

Made slightly more efficient
Added Build